From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 Apr 2012 06:40:21 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~2586
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5927b310c82f61ab3483fab0407032d2a57b56a3;p=emacs.git

Merge from trunk.
---

5927b310c82f61ab3483fab0407032d2a57b56a3